Documentation additions

diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c
index 6dd281831321620805cf1ffef6c03c22c18ccfb8..097009a40051da141a3c3054de6c81a592b40138 100644 (file)
--- a/gtk/gtkapplication.c
+++ b/gtk/gtkapplication.c
@@ -608,6 +608,11 @@ gtk_application_get_windows (GtkApplication *application)
  * are referred to with an "app." prefix, and window-specific actions
  * with a "win." prefix.
  *
+ * GtkApplication also extracts accelerators out of 'accel' attributes
+ * in the #GMenuModels passed to g_application_set_app_menu() and
+ * g_application_set_menubar(), which is usually more convenient
+ * than calling this function for each accelerator.
+ *
  * Since: 3.4
  */
 void

diff --git a/gtk/gtkapplicationwindow.c b/gtk/gtkapplicationwindow.c
index ce7d02795d450252e7e66cf43986a8dcae8ef3c5..3660b2c73911b1d763f0b929ba9a555d90889e86 100644 (file)
--- a/gtk/gtkapplicationwindow.c
+++ b/gtk/gtkapplicationwindow.c
@@ -37,7 +37,7 @@
  * GtkApplicationWindow is a #GtkWindow subclass that offers some
  * extra functionality for better integration with #GtkApplication
  * features.  Notably, it can handle both the application menu as well
- * as the menubar.  See g_application_set_app_menu() and
+ * as the menubar. See g_application_set_app_menu() and
  * g_application_set_menubar().
  *
  * This class implements the #GActionGroup and #GActionMap interfaces,
@@ -48,11 +48,19 @@
  * prefix.  Actions must be addressed with the prefixed name when
  * referring to them from a #GMenuModel.
  *
- * If the desktop environment does not display the application menu
- * as part of the desktop shell, then #GApplicationWindow will
- * automatically show the menu as part of a menubar. This behaviour
- * can be overridden with the #GtkApplicationWindow:show-menubar
- * property.
+ * The settings #GtkSettings:gtk-shell-shows-app-menu and
+ * #GtkSettings:gtk-shell-shows-menubar tell GTK+ whether the
+ * desktop environment is showing the application menu and menubar
+ * models outside the application as part of the desktop shell.
+ * For instance, on OS X, both menus will be displayed remotely;
+ * on Windows neither will be. gnome-shell (starting with version 3.4)
+ * will display the application menu, but not the menubar.
+ *
+ * If the desktop environment does not display the menubar, then
+ * #GApplicationWindow will automatically show a #GtkMenubar for it.
+ * This behaviour can be overridden with the #GtkApplicationWindow:show-menubar
+ * property. If the desktop environment does not display the application
+ * menu, then it will automatilly be included in the menubar.
  *
  * <example><title>A GtkApplicationWindow with a menubar</title>
  * <programlisting><![CDATA[